Drop all patches, applied upstream

diff --git a/debian/changelog b/debian/changelog
index b0fd2327e75e8924de754403b76f410bcaed58ed..b8ed0fba5c2aa5e694ebb99dd9671bee5f28347e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ gtk+4.0 (3.98.0-1) UNRELEASED; urgency=medium
     mode")
   * d/upstream/metadata: Add upstream URLs
   * New upstream release
+    - Drop all patches, applied upstream
   * d/copyright: Simplify and consolidate (see individual source files if
     finer detail is required)
     - Stop distinguishing between LGPL 2+ and 2.1+, list both as

diff --git a/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch b/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch
deleted file mode 100644 (file)
index 244acd2..0000000
--- a/debian/patches/gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 18 Jul 2019 09:20:57 +0100
-Subject: gtk4.pc: Move third-party libraries from Libs to Libs.private
-
-This avoids "overlinking". These libraries are an implementation detail
-of particular backends, so they only need to appear on library consumers'
-linker command-lines if the dependency cannot be picked up from the
-shared library automatically (when linking statically, or when building
-on a deficient OS that doesn't support transitive dependencies between
-shared libraries, in which case pkg-config should be built with
---enable-indirect-deps).
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/998
-Applied-upstream: 3.97.0, commit:01a6bbdc738c3a61f5806b977e2cd9911f71507d
----
- gtk4.pc.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtk4.pc.in b/gtk4.pc.in
-index e721361..b6822bd 100644
---- a/gtk4.pc.in
-+++ b/gtk4.pc.in
-@@ -12,5 +12,6 @@ Description: GTK Graphical UI Library
- Version: @VERSION@
- Requires: @GDK_PACKAGES@ @GSK_PACKAGES@ @GTK_PACKAGES@
- Requires.private: @GDK_PRIVATE_PACKAGES@ @GSK_PRIVATE_PACKAGES@ @GTK_PRIVATE_PACKAGES@
--Libs: -L${libdir} -lgtk-4 @GDK_EXTRA_LIBS@ @GSK_EXTRA_LIBS@ @GTK_EXTRA_LIBS@
-+Libs: -L${libdir} -lgtk-4
-+Libs.private: @GDK_EXTRA_LIBS@ @GSK_EXTRA_LIBS@ @GTK_EXTRA_LIBS@
- Cflags: -I${includedir}/gtk-@GTK_API_VERSION@ @GDK_EXTRA_CFLAGS@ @GSK_EXTRA_CFLAGS@ @GTK_EXTRA_CFLAGS@

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 341083f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-testsuite-Remove-dangling-references-to-box-packing-tests.patch
-gtk4.pc-Move-third-party-libraries-from-Libs-to-Libs.priv.patch

diff --git a/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch b/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch
deleted file mode 100644 (file)
index 3dbf26f..0000000
--- a/debian/patches/testsuite-Remove-dangling-references-to-box-packing-tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Wed, 17 Jul 2019 11:01:57 +0100
-Subject: testsuite: Remove dangling references to box-packing tests
-
-These were removed in commit c47abb5f, before 3.96.0.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://gitlab.gnome.org/GNOME/gtk/merge_requests/997
-Applied-upstream: 3.97.0, commit:5cfe9ab6033f85a8cd9d6eef541427f4fd0efc74
----
- testsuite/css/nodes/meson.build | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/testsuite/css/nodes/meson.build b/testsuite/css/nodes/meson.build
-index 67abd86..984cca6 100644
---- a/testsuite/css/nodes/meson.build
-+++ b/testsuite/css/nodes/meson.build
-@@ -19,10 +19,6 @@ test('nodes', test_nodes,
- test_data = [
-   'box.ltr.nodes',
-   'box.ltr.ui',
--  'box-packing.ltr.nodes',
--  'box-packing.ltr.ui',
--  'box-packing.rtl.nodes',
--  'box-packing.rtl.ui',
-   'box.rtl.nodes',
-   'box.rtl.ui',
-   'buttons.nodes',